From: Eli Zaretskii <eliz@gnu.org>
Date: Tue, 29 Apr 2025 07:09:54 +0000 (+0300)
Subject: ; Improve obsolescence of 'text-mode-variant'
X-Git-Tag: archive/raspbian/1%30.2+1-2+rpi1^2~2^2~24^2~118
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/success/%22http:/www.example.com/cgi/success?a=commitdiff_plain;h=9adb05422eaaa290a6a0542ba8862b806b34fe7c;p=emacs.git

; Improve obsolescence of 'text-mode-variant'

* lisp/textmodes/text-mode.el (text-mode-variant): Improve
obsolescence announcement text.

* doc/lispref/modes.texi (Example Major Modes): Update example.
(Bug#78125).
---

diff --git a/doc/lispref/modes.texi b/doc/lispref/modes.texi
index 31d420eedb6..3a6b163c81c 100644
--- a/doc/lispref/modes.texi
+++ b/doc/lispref/modes.texi
@@ -1509,9 +1509,6 @@ You can thus get the full benefit of adaptive filling
  (see the variable `adaptive-fill-mode').
 \\@{text-mode-map@}
 Turning on Text mode runs the normal hook `text-mode-hook'."
-@end group
-@group
-  (setq-local text-mode-variant t)
   (setq-local require-final-newline mode-require-final-newline))
 @end group
 @end smallexample
diff --git a/lisp/textmodes/text-mode.el b/lisp/textmodes/text-mode.el
index d918efa72c6..7507b7d80d1 100644
--- a/lisp/textmodes/text-mode.el
+++ b/lisp/textmodes/text-mode.el
@@ -39,7 +39,9 @@
 
 (defvar text-mode-variant nil
   "Non-nil if this buffer's major mode is a variant of Text mode.")
-(make-obsolete-variable 'text-mode-variant 'derived-mode-p "27.1")
+(make-obsolete-variable 'text-mode-variant
+                        "\
+Don't set it, and instead of testing its value use `derived-mode-p'." "27.1")
 
 ;; Actually defined in textconv.c.
 (defvar text-conversion-style)